Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: [DHIS2-15906] Add form features for relationship #3432

Merged
merged 12 commits into from
Oct 17, 2023
Merged

feat: [DHIS2-15906] Add form features for relationship #3432

merged 12 commits into from
Oct 17, 2023

Conversation

eirikhaugstulen
Copy link
Contributor

This PR adds:

  • Show first page in registration form
  • Attribute option combos
  • Autogenerateable events

@eirikhaugstulen eirikhaugstulen requested a review from a team as a code owner October 9, 2023 08:48
@eirikhaugstulen eirikhaugstulen changed the base branch from master to eh/feat/DHIS2-12616_CreateNewTrackedEntity October 9, 2023 08:48
@eirikhaugstulen eirikhaugstulen changed the title feat: [DHIS2] Add form features for relationship feat: [DHIS2-15906] Add form features for relationship Oct 9, 2023
simonadomnisoru
simonadomnisoru approved these changes Oct 12, 2023
View reviewed changes
Copy link
Contributor

@simonadomnisoru simonadomnisoru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! I just added a reminder to clean up commented lines of code.

...ure-core/components/Pages/common/TEIRelationshipsWidget/RegisterTei/RegisterTei.container.js Outdated
const error = useSelector(({ newRelationshipRegisterTei }) => (newRelationshipRegisterTei.error));
const selectedScopeId = suggestedProgramId || trackedEntityTypeId;
const { trackedEntityName } = useScopeInfo(selectedScopeId);
const { buildTeiPayload } = useDataEntryReduxConverter({
/* const {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some commented lines of code in this file. Can you clean them before merging? Thanks!

simonadomnisoru and others added 2 commits October 12, 2023 14:14
@simonadomnisoru
fix: [DHIS2-15827] remove effects of 'Prevent adding new events to st…
f17d087 
…age' action from the form (#3418)
@dhis2-bot
chore(release): cut 100.41.2 [skip release]
5efa7e9 
## [100.41.2](v100.41.1...v100.41.2) (2023-10-12)

### Bug Fixes

* [DHIS2-15827] remove effects of 'Prevent adding new events to stage' action from the form ([#3418](#3418)) ([f17d087](f17d087))
@github-actions
Copy link

github-actions bot commented Oct 12, 2023 •
edited
Loading

🚀 Deployed on https://deploy-preview-3432--dhis2-capture.netlify.app

@eirikhaugstulen eirikhaugstulen requested review from a team as code owners October 16, 2023 08:10
@eirikhaugstulen eirikhaugstulen merged commit 6016b85 into eh/feat/DHIS2-12616_CreateNewTrackedEntity Oct 17, 2023
10 of 15 checks passed
@eirikhaugstulen eirikhaugstulen deleted the eh/feat/DHIS2_AddAocAndFirstStageRelationship branch October 17, 2023 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoakimSM JoakimSM JoakimSM left review comments

@simonadomnisoru simonadomnisoru simonadomnisoru approved these changes

Assignees
No one assigned
Labels
testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@eirikhaugstulen @simonadomnisoru @JoakimSM @dhis2-bot